Skip to content

feat(lsp): respect IDE user proxy settings / forward trust store #5553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 19 commits into from
May 8, 2025
Merged

feat(lsp): respect IDE user proxy settings / forward trust store #5553

merged 19 commits into from
May 8, 2025

Conversation

rli
Copy link
Contributor

@rli rli commented Apr 10, 2025

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Description

Checklist

  • My code follows the code style of this project
  • I have added tests to cover my changes
  • A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
  • I have added metrics for my changes (if required)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 10, 2025 •
edited
Loading

Qodana Community for JVM

7 new problems were found

Inspection name Severity Problems
Usage of API marked for removal 🔴 Failure 7

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at qodana-support@jetbrains.com

github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 10, 2025
View reviewed changes
github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 11, 2025
View reviewed changes
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
put(
"HTTPS_PROXY",
URIBuilder("http://${address.hostname}:${address.port}").apply {
val login = HttpConfigurable.getInstance().proxyLogin

Check failure

Code scanning / QDJVMC

Usage of API marked for removal Error

'com.intellij.util.net.HttpConfigurable' is deprecated and marked for removal
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
put(
"HTTPS_PROXY",
URIBuilder("http://${address.hostname}:${address.port}").apply {
val login = HttpConfigurable.getInstance().proxyLogin

Check failure

Code scanning / QDJVMC

Usage of API marked for removal Error

'com.intellij.util.net.HttpConfigurable' is deprecated and marked for removal
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
put(
"HTTPS_PROXY",
URIBuilder("http://${address.hostname}:${address.port}").apply {
val login = HttpConfigurable.getInstance().proxyLogin

Check failure

Code scanning / QDJVMC

Usage of API marked for removal Error

'getProxyLogin()' is deprecated and marked for removal
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
URIBuilder("http://${address.hostname}:${address.port}").apply {
val login = HttpConfigurable.getInstance().proxyLogin
if (login != null) {
setUserInfo(login, HttpConfigurable.getInstance().plainProxyPassword)

Check failure

Code scanning / QDJVMC

Usage of API marked for removal Error

'com.intellij.util.net.HttpConfigurable' is deprecated and marked for removal
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
URIBuilder("http://${address.hostname}:${address.port}").apply {
val login = HttpConfigurable.getInstance().proxyLogin
if (login != null) {
setUserInfo(login, HttpConfigurable.getInstance().plainProxyPassword)

Check failure

Code scanning / QDJVMC

Usage of API marked for removal Error

'com.intellij.util.net.HttpConfigurable' is deprecated and marked for removal
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
URIBuilder("http://${address.hostname}:${address.port}").apply {
val login = HttpConfigurable.getInstance().proxyLogin
if (login != null) {
setUserInfo(login, HttpConfigurable.getInstance().plainProxyPassword)

Check failure

Code scanning / QDJVMC

Usage of API marked for removal Error

'getPlainProxyPassword()' is deprecated and marked for removal
@rli rli deleted the branch feature/q-lsp-chat April 18, 2025 19:44
@rli rli closed this Apr 18, 2025
@rli rli reopened this Apr 18, 2025
@rli rli changed the base branch from feature/q-lsp to main April 18, 2025 19:47
@rli rli changed the title wip: feature(lsp): respect IDE user proxy settings / forward trust store feature(lsp): respect IDE user proxy settings / forward trust store Apr 25, 2025
@rli rli marked this pull request as ready for review April 25, 2025 18:57
@rli rli requested a review from a team as a code owner April 25, 2025 18:57
manodnyab
manodnyab approved these changes May 6, 2025
View reviewed changes
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt Outdated
@@ -250,13 +258,49 @@ private class AmazonQServerInstance(private val project: Project, private val cs
init {
// will cause slow service init, but maybe fine for now. will not block UI since fetch/extract will be under background progress
val artifact = runBlocking { ArtifactManager(project, manifestRange = null).fetchArtifact() }.toAbsolutePath()

// more slowness
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: slowness added to which process?

github-advanced-security[bot]
github-advanced-security bot found potential problems May 8, 2025
View reviewed changes
...ains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt
@@ -20,6 +20,8 @@
import com.intellij.openapi.util.Key
import com.intellij.openapi.util.SystemInfo
import com.intellij.util.io.await
import com.intellij.util.net.HttpConfigurable

Check failure

Code scanning / QDJVMC

Usage of API marked for removal Error

'com.intellij.util.net.HttpConfigurable' is deprecated and marked for removal
@rli rli changed the base branch from main to feature/q-lsp-chat May 8, 2025 19:34
@rli rli changed the title feature(lsp): respect IDE user proxy settings / forward trust store feat(lsp): respect IDE user proxy settings / forward trust store May 8, 2025
@rli rli merged commit 20f1abc into feature/q-lsp-chat May 8, 2025
10 of 16 checks passed
@rli rli deleted the rli/lsp-proxy branch May 8, 2025 20:13
@shruti0085 shruti0085 mentioned this pull request Jul 11, 2025
Merged
shruti0085 added a commit to aws/amazon-q-eclipse that referenced this pull request Jul 16, 2025
@shruti0085
Pass IDE trusted system certs to Language server by default (#482)
bd51f6c 
This change improves the proxy support story for the extension. With this, we honor customer CA cert if specified in the preferences UI. If it is not supplied, instead of leaving it blank, we now detect system certificates and send it over to the node based language server. This allows us to address some issues where users are on corporate proxies/firewalls that have a proxy url but not an explicitly defined cert and expects applications to honor system certs.
We currently do the same system cert detection when downloading artifacts for lsp.

Follows a similar approach as JB: aws/aws-toolkit-jetbrains#5553
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manodnyab manodnyab manodnyab approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rli @manodnyab @aws-toolkit-automation